From: Marcel Denia <naoir@gmx.net>
Date: Thu, 25 Sep 2014 00:58:17 +0000 (+0200)
Subject: bash: Refresh patches
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=27b48028df44553049443694b311a2128cefc366;p=feed%2Fpackages.git

bash: Refresh patches

Signed-off-by: Marcel Denia <naoir@gmx.net>
---

diff --git a/utils/bash/patches/101-upstream-bash42-001.patch b/utils/bash/patches/101-upstream-bash42-001.patch
index 8aca8156be..3ad78f6773 100644
--- a/utils/bash/patches/101-upstream-bash42-001.patch
+++ b/utils/bash/patches/101-upstream-bash42-001.patch
@@ -34,7 +34,7 @@ Patch (apply with `patch -p0'):
  
    i = *sindex;
    while (c = string[i])
-@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, 
+@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp,
      {
        /* Extract the contents of the ${ ... } expansion
  	 according to the Posix.2 rules. */
diff --git a/utils/bash/patches/123-upstream-bash42-023.patch b/utils/bash/patches/123-upstream-bash42-023.patch
index 6c6fdb3e57..676d620f66 100644
--- a/utils/bash/patches/123-upstream-bash42-023.patch
+++ b/utils/bash/patches/123-upstream-bash42-023.patch
@@ -18,7 +18,7 @@ Patch (apply with `patch -p0'):
 
 --- a/subst.c
 +++ b/subst.c
-@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, 
+@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp,
      default:
      case '\0':
      bad_substitution:
diff --git a/utils/bash/patches/129-no_doc.patch b/utils/bash/patches/129-no_doc.patch
deleted file mode 100644
index 442cd22919..0000000000
--- a/utils/bash/patches/129-no_doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in
---- bash-4.2/Makefile.in	2010-12-01 01:22:42.000000000 +0100
-+++ bash-4.2.new/Makefile.in	2012-07-30 16:24:01.325057998 +0200
-@@ -724,10 +724,8 @@
- #	$(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
- 
- doc documentation:  force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
- 
- info dvi ps: force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
- 
- force:
- 
diff --git a/utils/bash/patches/900-no_doc.patch b/utils/bash/patches/900-no_doc.patch
new file mode 100644
index 0000000000..5dfb367b46
--- /dev/null
+++ b/utils/bash/patches/900-no_doc.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -724,10 +724,8 @@ reconfig: force
+ #	$(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
+ 
+ doc documentation:  force
+-	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
+ 
+ info dvi ps: force
+-	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
+ 
+ force:
+